Set OPENSSL_DIR for CI

diff --git a/.travis.yml b/.travis.yml
index 7e61d7e280feee57517aeff78a54e224ad9e1173..7b946c0186b41c482c2224b70b3e3d88cfdcccff 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,6 +25,7 @@ matrix:
            MACOSX_DEPLOYMENT_TARGET=10.7
       os: osx
       before_install:
+        - export OPENSSL_DIR=`brew --prefix openssl`
         - export OPENSSL_INCLUDE_DIR=`brew --prefix openssl`/include
         - export OPENSSL_LIB_DIR=`brew --prefix openssl`/include
     - env: TARGET=i686-apple-darwin
@@ -33,6 +34,7 @@ matrix:
            CFG_DISABLE_CROSS_TESTS=1
       os: osx
       before_install:
+        - export OPENSSL_DIR=`brew --prefix openssl`
         - export OPENSSL_INCLUDE_DIR=`brew --prefix openssl`/include
         - export OPENSSL_LIB_DIR=`brew --prefix openssl`/include
 

diff --git a/Makefile.in b/Makefile.in
index da0b097ffea72993b19a7a6cf0c75fb59a868da7..0c2ca69a376c496ffd22a88aafa43caa0124a241 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -251,10 +251,12 @@ target/openssl/$(1).stamp: target/openssl/openssl-$$(OPENSSL_VERS).tar.gz \
 
 # variables read by various build scripts to find openssl
 cargo-$(1): export OPENSSL_STATIC := 1
+cargo-$(1): export OPENSSL_DIR := $$(OPENSSL_INSTALL_$(1))
 cargo-$(1): export OPENSSL_ROOT_DIR := $$(OPENSSL_INSTALL_$(1))
 cargo-$(1): export OPENSSL_LIB_DIR := $$(OPENSSL_INSTALL_$(1))/lib
 cargo-$(1): export OPENSSL_INCLUDE_DIR := $$(OPENSSL_INSTALL_$(1))/include
 test-unit-$(1): export OPENSSL_STATIC := 1
+test-unit-$(1): export OPENSSL_DIR := $$(OPENSSL_INSTALL_$(1))
 test-unit-$(1): export OPENSSL_ROOT_DIR := $$(OPENSSL_INSTALL_$(1))
 test-unit-$(1): export OPENSSL_LIB_DIR := $$(OPENSSL_INSTALL_$(1))/lib
 test-unit-$(1): export OPENSSL_INCLUDE_DIR := $$(OPENSSL_INSTALL_$(1))/include